Autogenerated HTML docs for v1.5.1-rc2
diff --git a/glossary.html b/glossary.html index 7c7a064..da2370a 100644 --- a/glossary.html +++ b/glossary.html
@@ -263,139 +263,138 @@ </div> <div id="preamble"> <div class="sectionbody"> -<p>This list is sorted alphabetically:</p> <dl> <dt> -<a id="ref_alternate_object_database"></a>alternate object database +<a id="def_alternate_object_database"></a>alternate object database </dt> <dd> <p> - Via the alternates mechanism, a <a href="#ref_repository">repository</a> can - inherit part of its <a href="#ref_object_database">object database</a> from another - <a href="#ref_object_database">object database</a>, which is called "alternate". + Via the alternates mechanism, a <a href="#def_repository">repository</a> can + inherit part of its <a href="#def_object_database">object database</a> from another + <a href="#def_object_database">object database</a>, which is called "alternate". </p> </dd> <dt> -<a id="ref_bare_repository"></a>bare repository +<a id="def_bare_repository"></a>bare repository </dt> <dd> <p> - A <a href="#ref_bare_repository">bare repository</a> is normally an appropriately - named <a href="#ref_directory">directory</a> with a <tt>.git</tt> suffix that does not + A <a href="#def_bare_repository">bare repository</a> is normally an appropriately + named <a href="#def_directory">directory</a> with a <tt>.git</tt> suffix that does not have a locally checked-out copy of any of the files under - <a href="#ref_revision">revision</a> control. That is, all of the <tt>git</tt> + <a href="#def_revision">revision</a> control. That is, all of the <tt>git</tt> administrative and control files that would normally be present in the hidden <tt>.git</tt> sub-directory are directly present in the - <tt><a href="#ref_repository">repository</a>.git</tt> <a href="#ref_directory">directory</a> instead, + <tt>repository.git</tt> directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available. </p> </dd> <dt> -<a id="ref_blob_object"></a>blob object +<a id="def_blob_object"></a>blob object </dt> <dd> <p> - Untyped <a href="#ref_object">object</a>, e.g. the contents of a file. + Untyped <a href="#def_object">object</a>, e.g. the contents of a file. </p> </dd> <dt> -<a id="ref_branch"></a>branch +<a id="def_branch"></a>branch </dt> <dd> <p> A non-cyclical graph of revisions, i.e. the complete history of a - particular <a href="#ref_revision">revision</a>, which is called the - <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>. The <a href="#ref_branch">branch</a> heads + particular <a href="#def_revision">revision</a>, which is called the + branch <a href="#def_head">head</a>. The heads are stored in <tt>$GIT_DIR/refs/heads/</tt>. </p> </dd> <dt> -<a id="ref_cache"></a>cache +<a id="def_cache"></a>cache </dt> <dd> <p> - Obsolete for: <a href="#ref_index">index</a>. + Obsolete for: <a href="#def_index">index</a>. </p> </dd> <dt> -<a id="ref_chain"></a>chain +<a id="def_chain"></a>chain </dt> <dd> <p> - A list of objects, where each <a href="#ref_object">object</a> in the list contains + A list of objects, where each <a href="#def_object">object</a> in the list contains a reference to its successor (for example, the successor of a - <a href="#ref_commit">commit</a> could be one of its parents). + <a href="#def_commit">commit</a> could be one of its parents). </p> </dd> <dt> -<a id="ref_changeset"></a>changeset +<a id="def_changeset"></a>changeset </dt> <dd> <p> - BitKeeper/cvsps speak for "<a href="#ref_commit">commit</a>". Since git does not + BitKeeper/cvsps speak for "<a href="#def_commit">commit</a>". Since git does not store changes, but states, it really does not make sense to use the term "changesets" with git. </p> </dd> <dt> -<a id="ref_checkout"></a>checkout +<a id="def_checkout"></a>checkout </dt> <dd> <p> - The action of updating the <a href="#ref_working_tree">working tree</a> to a - <a href="#ref_revision">revision</a> which was stored in the - <a href="#ref_object_database">object database</a>. + The action of updating the <a href="#def_working_tree">working tree</a> to a + <a href="#def_revision">revision</a> which was stored in the + <a href="#def_object_database">object database</a>. </p> </dd> <dt> -<a id="ref_cherry-picking"></a>cherry-picking +<a id="def_cherry-picking"></a>cherry-picking </dt> <dd> <p> - In <a href="#ref_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of + In <a href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of different codebase. In GIT, this is performed by "git cherry-pick" command to extract the change introduced - by an existing <a href="#ref_commit">commit</a> and to record it based on the tip - of the current <a href="#ref_branch">branch</a> as a new <a href="#ref_commit">commit</a>. + by an existing <a href="#def_commit">commit</a> and to record it based on the tip + of the current <a href="#def_branch">branch</a> as a new <a href="#def_commit">commit</a>. </p> </dd> <dt> -<a id="ref_clean"></a>clean +<a id="def_clean"></a>clean </dt> <dd> <p> - A <a href="#ref_working_tree">working tree</a> is <a href="#ref_clean">clean</a>, if it - corresponds to the <a href="#ref_revision">revision</a> referenced by the current - <a href="#ref_head">head</a>. Also see "<a href="#ref_dirty">dirty</a>". + A <a href="#def_working_tree">working tree</a> is <a href="#def_clean">clean</a>, if it + corresponds to the <a href="#def_revision">revision</a> referenced by the current + <a href="#def_head">head</a>. Also see "<a href="#def_dirty">dirty</a>". </p> </dd> <dt> -<a id="ref_commit"></a>commit +<a id="def_commit"></a>commit </dt> <dd> <p> As a verb: The action of storing the current state of the - <a href="#ref_index">index</a> in the <a href="#ref_object_database">object database</a>. The - result is a <a href="#ref_revision">revision</a>. As a noun: Short hand for - <a href="#ref_commit_object">commit object</a>. + <a href="#def_index">index</a> in the <a href="#def_object_database">object database</a>. The + result is a <a href="#def_revision">revision</a>. As a noun: Short hand for + <a href="#def_commit_object">commit object</a>. </p> </dd> <dt> -<a id="ref_commit_object"></a>commit object +<a id="def_commit_object"></a>commit object </dt> <dd> <p> - An <a href="#ref_object">object</a> which contains the information about a - particular <a href="#ref_revision">revision</a>, such as parents, committer, - author, date and the <a href="#ref_tree_object">tree object</a> which corresponds - to the top <a href="#ref_directory">directory</a> of the stored - <a href="#ref_revision">revision</a>. + An <a href="#def_object">object</a> which contains the information about a + particular <a href="#def_revision">revision</a>, such as parents, committer, + author, date and the <a href="#def_tree_object">tree object</a> which corresponds + to the top <a href="#def_directory">directory</a> of the stored + <a href="#def_revision">revision</a>. </p> </dd> <dt> -<a id="ref_core_git"></a>core git +<a id="def_core_git"></a>core git </dt> <dd> <p> @@ -404,30 +403,30 @@ </p> </dd> <dt> -<a id="ref_DAG"></a>DAG +<a id="def_DAG"></a>DAG </dt> <dd> <p> - Directed acyclic graph. The <a href="#ref_commit">commit</a> objects form a + Directed acyclic graph. The <a href="#def_commit">commit</a> objects form a directed acyclic graph, because they have parents (directed), and the - graph of <a href="#ref_commit">commit</a> objects is acyclic (there is no - <a href="#ref_chain">chain</a> which begins and ends with the same - <a href="#ref_object">object</a>). + graph of <a href="#def_commit">commit</a> objects is acyclic (there is no + <a href="#def_chain">chain</a> which begins and ends with the same + <a href="#def_object">object</a>). </p> </dd> <dt> -<a id="ref_dangling_object"></a>dangling object +<a id="def_dangling_object"></a>dangling object </dt> <dd> <p> - An <a href="#ref_unreachable_object">unreachable object</a> which is not - <a href="#ref_reachable">reachable</a> even from other unreachable objects; a - <a href="#ref_dangling_object">dangling object</a> has no references to it from any - reference or <a href="#ref_object">object</a> in the <a href="#ref_repository">repository</a>. + An <a href="#def_unreachable_object">unreachable object</a> which is not + <a href="#def_reachable">reachable</a> even from other unreachable objects; a + <a href="#def_dangling_object">dangling object</a> has no references to it from any + reference or <a href="#def_object">object</a> in the <a href="#def_repository">repository</a>. </p> </dd> <dt> -<a id="ref_dircache"></a>dircache +<a id="def_dircache"></a>dircache </dt> <dd> <p> @@ -435,7 +434,7 @@ </p> </dd> <dt> -<a id="ref_directory"></a>directory +<a id="def_directory"></a>directory </dt> <dd> <p> @@ -443,54 +442,54 @@ </p> </dd> <dt> -<a id="ref_dirty"></a>dirty +<a id="def_dirty"></a>dirty </dt> <dd> <p> - A <a href="#ref_working_tree">working tree</a> is said to be <a href="#ref_dirty">dirty</a> if + A <a href="#def_working_tree">working tree</a> is said to be <a href="#def_dirty">dirty</a> if it contains modifications which have not been committed to the current - <a href="#ref_branch">branch</a>. + <a href="#def_branch">branch</a>. </p> </dd> <dt> -<a id="ref_ent"></a>ent +<a id="def_ent"></a>ent </dt> <dd> <p> - Favorite synonym to "<a href="#ref_tree-ish">tree-ish</a>" by some total geeks. See + Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See <tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)</tt> for an in-depth explanation. Avoid this term, not to confuse people. </p> </dd> <dt> -<a id="ref_fast_forward"></a>fast forward +<a id="def_fast_forward"></a>fast forward </dt> <dd> <p> - A fast-forward is a special type of <a href="#ref_merge">merge</a> where you have a - <a href="#ref_revision">revision</a> and you are "merging" another - <a href="#ref_branch">branch</a>'s changes that happen to be a descendant of what - you have. In such these cases, you do not make a new <a href="#ref_merge">merge</a> - <a href="#ref_commit">commit</a> but instead just update to his - <a href="#ref_revision">revision</a>. This will happen frequently on a - <a href="#ref_tracking_branch">tracking branch</a> of a remote - <a href="#ref_repository">repository</a>. + A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a + <a href="#def_revision">revision</a> and you are "merging" another + <a href="#def_branch">branch</a>'s changes that happen to be a descendant of what + you have. In such these cases, you do not make a new <a href="#def_merge">merge</a> + <a href="#def_commit">commit</a> but instead just update to his + <a href="#def_revision">revision</a>. This will happen frequently on a + <a href="#def_tracking_branch">tracking branch</a> of a remote + <a href="#def_repository">repository</a>. </p> </dd> <dt> -<a id="ref_fetch"></a>fetch +<a id="def_fetch"></a>fetch </dt> <dd> <p> - Fetching a <a href="#ref_branch">branch</a> means to get the - <a href="#ref_branch">branch</a>'s <a href="#ref_head_ref">head ref</a> from a remote - <a href="#ref_repository">repository</a>, to find out which objects are missing - from the local <a href="#ref_object_database">object database</a>, and to get them, + Fetching a <a href="#def_branch">branch</a> means to get the + <a href="#def_branch">branch</a>'s <a href="#def_head_ref">head ref</a> from a remote + <a href="#def_repository">repository</a>, to find out which objects are missing + from the local <a href="#def_object_database">object database</a>, and to get them, too. </p> </dd> <dt> -<a id="ref_file_system"></a>file system +<a id="def_file_system"></a>file system </dt> <dd> <p> @@ -500,54 +499,54 @@ </p> </dd> <dt> -<a id="ref_git_archive"></a>git archive +<a id="def_git_archive"></a>git archive </dt> <dd> <p> - Synonym for <a href="#ref_repository">repository</a> (for arch people). + Synonym for <a href="#def_repository">repository</a> (for arch people). </p> </dd> <dt> -<a id="ref_grafts"></a>grafts +<a id="def_grafts"></a>grafts </dt> <dd> <p> Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way - you can make git pretend the set of parents a <a href="#ref_commit">commit</a> has - is different from what was recorded when the <a href="#ref_commit">commit</a> was - created. Configured via the <tt>.git/info/<a href="#ref_grafts">grafts</a></tt> file. + you can make git pretend the set of parents a <a href="#def_commit">commit</a> has + is different from what was recorded when the <a href="#def_commit">commit</a> was + created. Configured via the <tt>.git/info/grafts</tt> file. </p> </dd> <dt> -<a id="ref_hash"></a>hash +<a id="def_hash"></a>hash </dt> <dd> <p> - In git's context, synonym to <a href="#ref_object_name">object name</a>. + In git's context, synonym to <a href="#def_object_name">object name</a>. </p> </dd> <dt> -<a id="ref_head"></a>head +<a id="def_head"></a>head </dt> <dd> <p> - The top of a <a href="#ref_branch">branch</a>. It contains a <a href="#ref_ref">ref</a> to the - corresponding <a href="#ref_commit_object">commit object</a>. + The top of a <a href="#def_branch">branch</a>. It contains a <a href="#def_ref">ref</a> to the + corresponding <a href="#def_commit_object">commit object</a>. </p> </dd> <dt> -<a id="ref_head_ref"></a>head ref +<a id="def_head_ref"></a>head ref </dt> <dd> <p> - A <a href="#ref_ref">ref</a> pointing to a <a href="#ref_head">head</a>. Often, this is - abbreviated to "<a href="#ref_head">head</a>". Head refs are stored in + A <a href="#def_ref">ref</a> pointing to a <a href="#def_head">head</a>. Often, this is + abbreviated to "<a href="#def_head">head</a>". Head refs are stored in <tt>$GIT_DIR/refs/heads/</tt>. </p> </dd> <dt> -<a id="ref_hook"></a>hook +<a id="def_hook"></a>hook </dt> <dd> <p> @@ -555,132 +554,132 @@ to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the - operation is done. The <a href="#ref_hook">hook</a> scripts are found in the - <tt>$GIT_DIR/hooks/</tt> <a href="#ref_directory">directory</a>, and are enabled by simply + operation is done. The <a href="#def_hook">hook</a> scripts are found in the + <tt>$GIT_DIR/hooks/</tt> <a href="#def_directory">directory</a>, and are enabled by simply making them executable. </p> </dd> <dt> -<a id="ref_index"></a>index +<a id="def_index"></a>index </dt> <dd> <p> A collection of files with stat information, whose contents are stored - as objects. The <a href="#ref_index">index</a> is a stored version of your working - <a href="#ref_tree">tree</a>. Truth be told, it can also contain a second, and even - a third version of a <a href="#ref_working_tree">working tree</a>, which are used + as objects. The <a href="#def_index">index</a> is a stored version of your working + <a href="#def_tree">tree</a>. Truth be told, it can also contain a second, and even + a third version of a <a href="#def_working_tree">working tree</a>, which are used when merging. </p> </dd> <dt> -<a id="ref_index_entry"></a>index entry +<a id="def_index_entry"></a>index entry </dt> <dd> <p> The information regarding a particular file, stored in the - <a href="#ref_index">index</a>. An <a href="#ref_index_entry">index entry</a> can be unmerged, - if a <a href="#ref_merge">merge</a> was started, but not yet finished (i.e. if the - <a href="#ref_index">index</a> contains multiple versions of that file). + <a href="#def_index">index</a>. An <a href="#def_index_entry">index entry</a> can be unmerged, + if a <a href="#def_merge">merge</a> was started, but not yet finished (i.e. if the + <a href="#def_index">index</a> contains multiple versions of that file). </p> </dd> <dt> -<a id="ref_master"></a>master +<a id="def_master"></a>master </dt> <dd> <p> - The default development <a href="#ref_branch">branch</a>. Whenever you create a git - <a href="#ref_repository">repository</a>, a <a href="#ref_branch">branch</a> named - "<a href="#ref_master">master</a>" is created, and becomes the active - <a href="#ref_branch">branch</a>. In most cases, this contains the local + The default development <a href="#def_branch">branch</a>. Whenever you create a git + <a href="#def_repository">repository</a>, a <a href="#def_branch">branch</a> named + "<a href="#def_master">master</a>" is created, and becomes the active + <a href="#def_branch">branch</a>. In most cases, this contains the local development, though that is purely conventional and not required. </p> </dd> <dt> -<a id="ref_merge"></a>merge +<a id="def_merge"></a>merge </dt> <dd> <p> - To <a href="#ref_merge">merge</a> branches means to try to accumulate the changes + To <a href="#def_merge">merge</a> branches means to try to accumulate the changes since a common ancestor and apply them to the first - <a href="#ref_branch">branch</a>. An automatic <a href="#ref_merge">merge</a> uses heuristics - to accomplish that. Evidently, an automatic <a href="#ref_merge">merge</a> can + <a href="#def_branch">branch</a>. An automatic <a href="#def_merge">merge</a> uses heuristics + to accomplish that. Evidently, an automatic <a href="#def_merge">merge</a> can fail. </p> </dd> <dt> -<a id="ref_object"></a>object +<a id="def_object"></a>object </dt> <dd> <p> The unit of storage in git. It is uniquely identified by the - <a href="#ref_SHA1">SHA1</a> of its contents. Consequently, an - <a href="#ref_object">object</a> can not be changed. + <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an + <a href="#def_object">object</a> can not be changed. </p> </dd> <dt> -<a id="ref_object_database"></a>object database +<a id="def_object_database"></a>object database </dt> <dd> <p> - Stores a set of "objects", and an individual <a href="#ref_object">object</a> is - identified by its <a href="#ref_object_name">object name</a>. The objects usually + Stores a set of "objects", and an individual <a href="#def_object">object</a> is + identified by its <a href="#def_object_name">object name</a>. The objects usually live in <tt>$GIT_DIR/objects/</tt>. </p> </dd> <dt> -<a id="ref_object_identifier"></a>object identifier +<a id="def_object_identifier"></a>object identifier </dt> <dd> <p> - Synonym for <a href="#ref_object_name">object name</a>. + Synonym for <a href="#def_object_name">object name</a>. </p> </dd> <dt> -<a id="ref_object_name"></a>object name +<a id="def_object_name"></a>object name </dt> <dd> <p> - The unique identifier of an <a href="#ref_object">object</a>. The <a href="#ref_hash">hash</a> - of the <a href="#ref_object">object</a>'s contents using the Secure Hash Algorithm + The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a> + of the <a href="#def_object">object</a>'s contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the <a href="#ref_hash">hash</a> of the <a href="#ref_object">object</a> (possibly followed by + the <a href="#def_hash">hash</a> of the <a href="#def_object">object</a> (possibly followed by a white space). </p> </dd> <dt> -<a id="ref_object_type"></a>object type +<a id="def_object_type"></a>object type </dt> <dd> <p> One of the identifiers - "<a href="#ref_commit">commit</a>","<a href="#ref_tree">tree</a>","<a href="#ref_tag">tag</a>" and "blob" - describing the type of an <a href="#ref_object">object</a>. + "<a href="#def_commit">commit</a>","<a href="#def_tree">tree</a>","<a href="#def_tag">tag</a>" or "<a href="#def_blob_object">blob</a>" + describing the type of an <a href="#def_object">object</a>. </p> </dd> <dt> -<a id="ref_octopus"></a>octopus +<a id="def_octopus"></a>octopus </dt> <dd> <p> - To <a href="#ref_merge">merge</a> more than two branches. Also denotes an + To <a href="#def_merge">merge</a> more than two branches. Also denotes an intelligent predator. </p> </dd> <dt> -<a id="ref_origin"></a>origin +<a id="def_origin"></a>origin </dt> <dd> <p> - The default upstream <a href="#ref_repository">repository</a>. Most projects have + The default upstream <a href="#def_repository">repository</a>. Most projects have at least one upstream project which they track. By default - <em><a href="#ref_origin">origin</a></em> is used for that purpose. New upstream updates + <em><a href="#def_origin">origin</a></em> is used for that purpose. New upstream updates will be fetched into remote tracking branches named - <a href="#ref_origin">origin</a>/name-of-upstream-branch, which you can see using - "git <a href="#ref_branch">branch</a> -r". + origin/name-of-upstream-branch, which you can see using + "git <a href="#def_branch">branch</a> -r". </p> </dd> <dt> -<a id="ref_pack"></a>pack +<a id="def_pack"></a>pack </dt> <dd> <p> @@ -689,177 +688,177 @@ </p> </dd> <dt> -<a id="ref_pack_index"></a>pack index +<a id="def_pack_index"></a>pack index </dt> <dd> <p> The list of identifiers, and other information, of the objects in a - <a href="#ref_pack">pack</a>, to assist in efficiently accessing the contents of a - <a href="#ref_pack">pack</a>. + <a href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a + <a href="#def_pack">pack</a>. </p> </dd> <dt> -<a id="ref_parent"></a>parent +<a id="def_parent"></a>parent </dt> <dd> <p> - A <a href="#ref_commit_object">commit object</a> contains a (possibly empty) list + A <a href="#def_commit_object">commit object</a> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents. </p> </dd> <dt> -<a id="ref_pickaxe"></a>pickaxe +<a id="def_pickaxe"></a>pickaxe </dt> <dd> <p> - The term <a href="#ref_pickaxe">pickaxe</a> refers to an option to the diffcore + The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the —pickaxe-all option, it can be used to view the full - <a href="#ref_changeset">changeset</a> that introduced or removed, say, a + <a href="#def_changeset">changeset</a> that introduced or removed, say, a particular line of text. See <a href="git-diff.html">git-diff(1)</a>. </p> </dd> <dt> -<a id="ref_plumbing"></a>plumbing +<a id="def_plumbing"></a>plumbing </dt> <dd> <p> - Cute name for <a href="#ref_core_git">core git</a>. + Cute name for <a href="#def_core_git">core git</a>. </p> </dd> <dt> -<a id="ref_porcelain"></a>porcelain +<a id="def_porcelain"></a>porcelain </dt> <dd> <p> Cute name for programs and program suites depending on - <a href="#ref_core_git">core git</a>, presenting a high level access to - <a href="#ref_core_git">core git</a>. Porcelains expose more of a <a href="#ref_SCM">SCM</a> - interface than the <a href="#ref_plumbing">plumbing</a>. + <a href="#def_core_git">core git</a>, presenting a high level access to + <a href="#def_core_git">core git</a>. Porcelains expose more of a <a href="#def_SCM">SCM</a> + interface than the <a href="#def_plumbing">plumbing</a>. </p> </dd> <dt> -<a id="ref_pull"></a>pull +<a id="def_pull"></a>pull </dt> <dd> <p> - Pulling a <a href="#ref_branch">branch</a> means to <a href="#ref_fetch">fetch</a> it and - <a href="#ref_merge">merge</a> it. + Pulling a <a href="#def_branch">branch</a> means to <a href="#def_fetch">fetch</a> it and + <a href="#def_merge">merge</a> it. </p> </dd> <dt> -<a id="ref_push"></a>push +<a id="def_push"></a>push </dt> <dd> <p> - Pushing a <a href="#ref_branch">branch</a> means to get the <a href="#ref_branch">branch</a>'s - <a href="#ref_head_ref">head ref</a> from a remote <a href="#ref_repository">repository</a>, - find out if it is an ancestor to the <a href="#ref_branch">branch</a>'s local - <a href="#ref_head_ref">head ref</a> is a direct, and in that case, putting all - objects, which are <a href="#ref_reachable">reachable</a> from the local - <a href="#ref_head_ref">head ref</a>, and which are missing from the remote - <a href="#ref_repository">repository</a>, into the remote - <a href="#ref_object_database">object database</a>, and updating the remote - <a href="#ref_head_ref">head ref</a>. If the remote <a href="#ref_head">head</a> is not an - ancestor to the local <a href="#ref_head">head</a>, the <a href="#ref_push">push</a> fails. + Pushing a <a href="#def_branch">branch</a> means to get the <a href="#def_branch">branch</a>'s + <a href="#def_head_ref">head ref</a> from a remote <a href="#def_repository">repository</a>, + find out if it is an ancestor to the <a href="#def_branch">branch</a>'s local + <a href="#def_head_ref">head ref</a> is a direct, and in that case, putting all + objects, which are <a href="#def_reachable">reachable</a> from the local + <a href="#def_head_ref">head ref</a>, and which are missing from the remote + <a href="#def_repository">repository</a>, into the remote + <a href="#def_object_database">object database</a>, and updating the remote + <a href="#def_head_ref">head ref</a>. If the remote <a href="#def_head">head</a> is not an + ancestor to the local <a href="#def_head">head</a>, the <a href="#def_push">push</a> fails. </p> </dd> <dt> -<a id="ref_reachable"></a>reachable +<a id="def_reachable"></a>reachable </dt> <dd> <p> - All of the ancestors of a given <a href="#ref_commit">commit</a> are said to be - <a href="#ref_reachable">reachable</a> from that <a href="#ref_commit">commit</a>. More - generally, one <a href="#ref_object">object</a> is <a href="#ref_reachable">reachable</a> from - another if we can reach the one from the other by a <a href="#ref_chain">chain</a> - that follows tags to whatever they <a href="#ref_tag">tag</a>, commits to their - parents or trees, and trees to the trees or blobs that they contain. + All of the ancestors of a given <a href="#def_commit">commit</a> are said to be + <a href="#def_reachable">reachable</a> from that <a href="#def_commit">commit</a>. More + generally, one <a href="#def_object">object</a> is <a href="#def_reachable">reachable</a> from + another if we can reach the one from the other by a <a href="#def_chain">chain</a> + that follows <a href="#def_tag">tags</a> to whatever they tag, + <a href="#def_commit_object">commits</a> to their parents or trees, and + <a href="#def_tree_object">trees</a> to the trees or <a href="#def_blob_object">blobs</a> + that they contain. </p> </dd> <dt> -<a id="ref_rebase"></a>rebase +<a id="def_rebase"></a>rebase </dt> <dd> <p> - To <a href="#ref_clean">clean</a> a <a href="#ref_branch">branch</a> by starting from the - <a href="#ref_head">head</a> of the main line of development - ("<a href="#ref_master">master</a>"), and reapply the (possibly cherry-picked) - changes from that <a href="#ref_branch">branch</a>. + To reapply a series of changes from a <a href="#def_branch">branch</a> to a + different base, and reset the <a href="#def_head">head</a> of that branch + to the result. </p> </dd> <dt> -<a id="ref_ref"></a>ref +<a id="def_ref"></a>ref </dt> <dd> <p> - A 40-byte hex representation of a <a href="#ref_SHA1">SHA1</a> or a name that - denotes a particular <a href="#ref_object">object</a>. These may be stored in + A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that + denotes a particular <a href="#def_object">object</a>. These may be stored in <tt>$GIT_DIR/refs/</tt>. </p> </dd> <dt> -<a id="ref_refspec"></a>refspec +<a id="def_refspec"></a>refspec </dt> <dd> <p> - A <a href="#ref_refspec">refspec</a> is used by <a href="#ref_fetch">fetch</a> and - <a href="#ref_push">push</a> to describe the mapping between remote <a href="#ref_ref">ref</a> - and local <a href="#ref_ref">ref</a>. They are combined with a colon in the format + A <a href="#def_refspec">refspec</a> is used by <a href="#def_fetch">fetch</a> and + <a href="#def_push">push</a> to describe the mapping between remote <a href="#def_ref">ref</a> + and local <a href="#def_ref">ref</a>. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. For example: <tt>git - <a href="#ref_fetch">fetch</a> $URL - refs/heads/<a href="#ref_master">master</a>:refs/heads/<a href="#ref_origin">origin</a></tt> means - "grab the <a href="#ref_master">master</a> <a href="#ref_branch">branch</a> <a href="#ref_head">head</a> - from the $URL and store it as my <a href="#ref_origin">origin</a> - <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>". And <tt>git <a href="#ref_push">push</a> - $URL refs/heads/<a href="#ref_master">master</a>:refs/heads/to-upstream</tt> means - "publish my <a href="#ref_master">master</a> <a href="#ref_branch">branch</a> - <a href="#ref_head">head</a> as to-upstream <a href="#ref_branch">branch</a> at $URL". See + fetch $URL refs/heads/master:refs/heads/origin</tt> means + "grab the master <a href="#def_branch">branch</a> <a href="#def_head">head</a> + from the $URL and store it as my origin + <a href="#def_branch">branch</a> <a href="#def_head">head</a>". And <tt>git <a href="#def_push">push</a> + $URL refs/heads/master:refs/heads/to-upstream</tt> means + "publish my master <a href="#def_branch">branch</a> + <a href="#def_head">head</a> as to-upstream <a href="#def_branch">branch</a> at $URL". See also <a href="git-push.html">git-push(1)</a> </p> </dd> <dt> -<a id="ref_repository"></a>repository +<a id="def_repository"></a>repository </dt> <dd> <p> - A collection of refs together with an <a href="#ref_object_database">object database</a> containing all objects, which are <a href="#ref_reachable">reachable</a> + A collection of refs together with an <a href="#def_object_database">object database</a> containing all objects which are <a href="#def_reachable">reachable</a> from the refs, possibly accompanied by meta data from one or more - porcelains. A <a href="#ref_repository">repository</a> can share an - <a href="#ref_object_database">object database</a> with other repositories. + porcelains. A <a href="#def_repository">repository</a> can share an + <a href="#def_object_database">object database</a> with other repositories. </p> </dd> <dt> -<a id="ref_resolve"></a>resolve +<a id="def_resolve"></a>resolve </dt> <dd> <p> The action of fixing up manually what a failed automatic - <a href="#ref_merge">merge</a> left behind. + <a href="#def_merge">merge</a> left behind. </p> </dd> <dt> -<a id="ref_revision"></a>revision +<a id="def_revision"></a>revision </dt> <dd> <p> A particular state of files and directories which was stored in the - <a href="#ref_object_database">object database</a>. It is referenced by a - <a href="#ref_commit_object">commit object</a>. + <a href="#def_object_database">object database</a>. It is referenced by a + <a href="#def_commit_object">commit object</a>. </p> </dd> <dt> -<a id="ref_rewind"></a>rewind +<a id="def_rewind"></a>rewind </dt> <dd> <p> To throw away part of the development, i.e. to assign the - <a href="#ref_head">head</a> to an earlier <a href="#ref_revision">revision</a>. + <a href="#def_head">head</a> to an earlier <a href="#def_revision">revision</a>. </p> </dd> <dt> -<a id="ref_SCM"></a>SCM +<a id="def_SCM"></a>SCM </dt> <dd> <p> @@ -867,72 +866,72 @@ </p> </dd> <dt> -<a id="ref_SHA1"></a>SHA1 +<a id="def_SHA1"></a>SHA1 </dt> <dd> <p> - Synonym for <a href="#ref_object_name">object name</a>. + Synonym for <a href="#def_object_name">object name</a>. </p> </dd> <dt> -<a id="ref_shallow_repository"></a>shallow repository +<a id="def_shallow_repository"></a>shallow repository </dt> <dd> <p> - A <a href="#ref_shallow_repository">shallow repository</a> has an incomplete + A <a href="#def_shallow_repository">shallow repository</a> has an incomplete history some of whose commits have parents cauterized away (in other words, git is told to pretend that these commits do not have the - parents, even though they are recorded in the <a href="#ref_commit_object">commit object</a>). This is sometimes useful when you are interested only in the + parents, even though they are recorded in the <a href="#def_commit_object">commit object</a>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the - upstream is much larger. A <a href="#ref_shallow_repository">shallow repository</a> - is created by giving <tt>—depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and its - history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>. + upstream is much larger. A <a href="#def_shallow_repository">shallow repository</a> + is created by giving the <tt>—depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and + its history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>. </p> </dd> <dt> -<a id="ref_symref"></a>symref +<a id="def_symref"></a>symref </dt> <dd> <p> - Symbolic reference: instead of containing the <a href="#ref_SHA1">SHA1</a> id - itself, it is of the format <em><a href="#ref_ref">ref</a>: refs/some/thing</em> and when + Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a> id + itself, it is of the format <em>ref: refs/some/thing</em> and when referenced, it recursively dereferences to this reference. <em>HEAD</em> is a - prime example of a <a href="#ref_symref">symref</a>. Symbolic references are + prime example of a <a href="#def_symref">symref</a>. Symbolic references are manipulated with the <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a> command. </p> </dd> <dt> -<a id="ref_tag"></a>tag +<a id="def_tag"></a>tag </dt> <dd> <p> - A <a href="#ref_ref">ref</a> pointing to a <a href="#ref_tag">tag</a> or - <a href="#ref_commit_object">commit object</a>. In contrast to a <a href="#ref_head">head</a>, - a <a href="#ref_tag">tag</a> is not changed by a <a href="#ref_commit">commit</a>. Tags (not - <a href="#ref_tag">tag</a> objects) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A git - <a href="#ref_tag">tag</a> has nothing to do with a Lisp <a href="#ref_tag">tag</a> (which is - called <a href="#ref_object_type">object type</a> in git's context). A - <a href="#ref_tag">tag</a> is most typically used to mark a particular point in the - <a href="#ref_commit">commit</a> ancestry <a href="#ref_chain">chain</a>. + A <a href="#def_ref">ref</a> pointing to a <a href="#def_tag">tag</a> or + <a href="#def_commit_object">commit object</a>. In contrast to a <a href="#def_head">head</a>, + a tag is not changed by a <a href="#def_commit">commit</a>. Tags (not + <a href="#def_tag_object">tag objects</a>) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A + git tag has nothing to do with a Lisp tag (which would be + called an <a href="#def_object_type">object type</a> in git's context). A + tag is most typically used to mark a particular point in the + <a href="#def_commit">commit</a> ancestry <a href="#def_chain">chain</a>. </p> </dd> <dt> -<a id="ref_tag_object"></a>tag object +<a id="def_tag_object"></a>tag object </dt> <dd> <p> - An <a href="#ref_object">object</a> containing a <a href="#ref_ref">ref</a> pointing to - another <a href="#ref_object">object</a>, which can contain a message just like a - <a href="#ref_commit_object">commit object</a>. It can also contain a (PGP) - signature, in which case it is called a "signed <a href="#ref_tag_object">tag object</a>". + An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to + another <a href="#def_object">object</a>, which can contain a message just like a + <a href="#def_commit_object">commit object</a>. It can also contain a (PGP) + signature, in which case it is called a "signed <a href="#def_tag_object">tag object</a>". </p> </dd> <dt> -<a id="ref_topic_branch"></a>topic branch +<a id="def_topic_branch"></a>topic branch </dt> <dd> <p> - A regular git <a href="#ref_branch">branch</a> that is used by a developer to + A regular git <a href="#def_branch">branch</a> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet @@ -940,86 +939,78 @@ </p> </dd> <dt> -<a id="ref_tracking_branch"></a>tracking branch +<a id="def_tracking_branch"></a>tracking branch </dt> <dd> <p> - A regular git <a href="#ref_branch">branch</a> that is used to follow changes from - another <a href="#ref_repository">repository</a>. A <a href="#ref_tracking_branch">tracking branch</a> should not contain direct modifications or have local commits - made to it. A <a href="#ref_tracking_branch">tracking branch</a> can usually be - identified as the right-hand-side <a href="#ref_ref">ref</a> in a Pull: - <a href="#ref_refspec">refspec</a>. + A regular git <a href="#def_branch">branch</a> that is used to follow changes from + another <a href="#def_repository">repository</a>. A <a href="#def_tracking_branch">tracking branch</a> should not contain direct modifications or have local commits + made to it. A <a href="#def_tracking_branch">tracking branch</a> can usually be + identified as the right-hand-side <a href="#def_ref">ref</a> in a Pull: + <a href="#def_refspec">refspec</a>. </p> </dd> <dt> -<a id="ref_tree"></a>tree +<a id="def_tree"></a>tree </dt> <dd> <p> - Either a <a href="#ref_working_tree">working tree</a>, or a <a href="#ref_tree_object">tree object</a> together with the dependent blob and <a href="#ref_tree">tree</a> objects - (i.e. a stored representation of a <a href="#ref_working_tree">working tree</a>). + Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree object</a> together with the dependent blob and <a href="#def_tree">tree</a> objects + (i.e. a stored representation of a <a href="#def_working_tree">working tree</a>). </p> </dd> <dt> -<a id="ref_tree_object"></a>tree object +<a id="def_tree_object"></a>tree object </dt> <dd> <p> - An <a href="#ref_object">object</a> containing a list of file names and modes along - with refs to the associated blob and/or <a href="#ref_tree">tree</a> objects. A - <a href="#ref_tree">tree</a> is equivalent to a <a href="#ref_directory">directory</a>. + An <a href="#def_object">object</a> containing a list of file names and modes along + with refs to the associated blob and/or tree objects. A + <a href="#def_tree">tree</a> is equivalent to a <a href="#def_directory">directory</a>. </p> </dd> <dt> -<a id="ref_tree-ish"></a>tree-ish +<a id="def_tree-ish"></a>tree-ish </dt> <dd> <p> - A <a href="#ref_ref">ref</a> pointing to either a <a href="#ref_commit_object">commit object</a>, a <a href="#ref_tree_object">tree object</a>, or a <a href="#ref_tag_object">tag object</a> pointing to a <a href="#ref_tag">tag</a> or <a href="#ref_commit">commit</a> or - <a href="#ref_tree_object">tree object</a>. + A <a href="#def_ref">ref</a> pointing to either a <a href="#def_commit_object">commit object</a>, a <a href="#def_tree_object">tree object</a>, or a <a href="#def_tag_object">tag object</a> pointing to a <a href="#def_tag">tag</a> or <a href="#def_commit">commit</a> or + <a href="#def_tree_object">tree object</a>. </p> </dd> <dt> -<a id="ref_unmerged_index"></a>unmerged index +<a id="def_unmerged_index"></a>unmerged index </dt> <dd> <p> - An <a href="#ref_index">index</a> which contains <a href="#ref_unmerged_index">unmerged index</a> entries. + An <a href="#def_index">index</a> which contains unmerged + <a href="#def_index_entry">index entries</a>. </p> </dd> <dt> -<a id="ref_unreachable_object"></a>unreachable object +<a id="def_unreachable_object"></a>unreachable object </dt> <dd> <p> - An <a href="#ref_object">object</a> which is not <a href="#ref_reachable">reachable</a> from a - <a href="#ref_branch">branch</a>, <a href="#ref_tag">tag</a>, or any other reference. + An <a href="#def_object">object</a> which is not <a href="#def_reachable">reachable</a> from a + <a href="#def_branch">branch</a>, <a href="#def_tag">tag</a>, or any other reference. </p> </dd> <dt> -<a id="ref_working_tree"></a>working tree +<a id="def_working_tree"></a>working tree </dt> <dd> <p> The set of files and directories currently being worked on, i.e. you can - work in your <a href="#ref_working_tree">working tree</a> without using git at all. + work in your <a href="#def_working_tree">working tree</a> without using git at all. </p> </dd> </dl> </div> </div> -<h2>Author</h2> -<div class="sectionbody"> -<p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de> and -the git-list <git@vger.kernel.org>.</p> -</div> -<h2>GIT</h2> -<div class="sectionbody"> -<p>Part of the <a href="git.html">git</a> suite</p> -</div> <div id="footer"> <div id="footer-text"> -Last updated 12-Mar-2007 07:28:58 UTC +Last updated 26-Mar-2007 02:33:24 UTC </div> </div> </body> 